Merge branch 'ar-linker-host' of https://github.com/japaric/cargo into ar-linker...
authorAlex Crichton <alex@alexcrichton.com>
Wed, 29 Apr 2015 18:28:06 +0000 (11:28 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 29 Apr 2015 18:28:06 +0000 (11:28 -0700)

Trivial merge